From: Thierry Volpiatto <thierry.volpiatto@gmail.com>
Date: Fri, 2 Sep 2011 07:54:34 +0000 (-0700)
Subject: Add missing piece of earlier commit.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~845^2~7
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=81ec0c88f2f27c090c5928f78a9c6afb8c1b2f72;p=emacs.git

Add missing piece of earlier commit.

* lisp/vc/vc-rcs.el (vc-rcs-responsible-p): Handle directories.

Fixes: debbugs:9391
---

diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el
index 488efaa3522..8051009a983 100644
--- a/lisp/vc/vc-rcs.el
+++ b/lisp/vc/vc-rcs.el
@@ -314,7 +314,10 @@ expanded if `vc-keep-workfiles' is non-nil, otherwise, delete the workfile."
 (defun vc-rcs-responsible-p (file)
   "Return non-nil if RCS thinks it would be responsible for registering FILE."
   ;; TODO: check for all the patterns in vc-rcs-master-templates
-  (file-directory-p (expand-file-name "RCS" (file-name-directory file))))
+  (file-directory-p (expand-file-name "RCS"
+                                      (if (file-directory-p file)
+                                          file
+                                        (file-name-directory file)))))
 
 (defun vc-rcs-receive-file (file rev)
   "Implementation of receive-file for RCS."